Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 20 Jul 2011 16:32:42 +0000 (09:32 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 20 Jul 2011 16:32:42 +0000 (09:32 -0700)
commit6603de26db707f3ca3f03e651ca9e0e1a1f5db7c
tree99a75dfc1e631bccb2b0b39de9ab6c7a644ae874
parent8791fa00d46f9125b10d6400101988474cb9aa06
parent8b9b5baf145355459f77f83854638a3d94f47acb
Merge from trunk.